Bah, layout reinstated for flow reasons