This reverts commit e5223369.

This commit still caused regressions. Clearly FormLayout label
adjustments need a *lot* more testing before any changes are
made, and changes shouldn't be pushed right before Frameworks
tagging.

BUG: 429115
FIXED-IN: 5.77
CCMAIL: uhhadd@gmail.com