This reverts commit f17eae91.

It was committed without adequate discussion and there were unresolved
discussions. Furthermore, no code review was done, and as a result it
shipped with visual regressions.

We will re-discuss and commit a fixed version if appropriate.