Revert "Make google edition specific changes google edition specific"

This reverts commit 25f57439f7b80c8306651f4f4c2a35df8e4e5bb6.