Revert 473f52f..1c53fe0

This rolls back to commit 473f52fbda34d8382b23e85e1ea1d6c0d98abc61.
Layout 3