Revert "update layout for next Zuul version"

Revering Zuul upgrade :(

This reverts commit 830136249a9f646bcc869aa81d40c6a9803042fe.

Change-Id: Ie123a39f3d7a69c8e8efef90cc78dd2b091d0017