Revert a big chunk of 0652fbf.

Apparently using the GitHub online editor is not something I should
do in the future. :|