Turns out this depends on not doing layout, and so is a real corner-case.

Change-Id: If9d2db6b1a0df94fc809fb353f2dbf2cf9ac1c9a