Revert "Merge branch 'CSS-Work'"

This reverts commit 66fd466c16f57e9c54428ee39a208ee5e20d3be1, reversing
changes made to c9b0f4f2934767c58b8a03a4de3abbc44c5277de.