Revert "Merge branch 'ugly' into webforms-cs"

This reverts commit 0d6b70a3d635f683ceae52bede7c641051c2b6d3, reversing
changes made to a88ca1785f0c1f44ff8dc49054272be6d2a69ebd.