This reverts commit dd2c639c. It broke a few things -- the explanation will be posted to the review thread.