this one was a complete pig to convert with the
conflicting home-grown existing layout code.

Change-Id: I135bd486d10f7d972e143daae44d6b24a6e8fdb8