Rollback CSS fix a9975d123e9fbc3a10cb06b5cf6f66524ff463db. Caused lots of issues.