Revert "Merge branch 'dev' into responsive-layout"

This reverts commit 9044d4f8fac317bb83261f0138ed8c7140925f19, reversing
changes made to 81f32748a128e28614165d6f3f9e0ab681a2b037.