Fix extra layout round-trip introduced by fix for issue #2420