Reverting to simplify some Google-internal rollout issues. Will recommit in a week or two. This reverts commit 517bbc64.