Revert "Merge branch 'responsive'"

This reverts commit bd144c699c1b9194fd50befa4fb8f41d014b4dda, reversing
changes made to e051f011daef810a66d6120078de36280d1d2b73.