Revert "Fix google layout fail"

This reverts commit 698d922031bfd6e2907f106ddbd6ea62041953f5.