Revert "Make the google-edition specific changes specific to the google edition"

This reverts commit 4c1fc4db3b2c005e0f7ecb5102cbb0a19d7dfe63.