This reverts commit 60c21c78. The commit above is no longer required for the development of this redesign.
