Revert "jf: Some google edition changes"

This reverts commit 4b6a276abd35ab012fce86c3a1d2e0477a47904a.
Make the google-edition specific changes specific to the google edition

Change-Id: I98e51701985ead35c5ba26496bdd19e257862a34