Reformat layout.
Revert "Reformat layout."

This reverts commit 268a3db12bceaa1621bd4f2aa5f552d034eac18d.