Revert "Merge branch 'redesign'"

This reverts commit 1ce09ad2fa422b6690b27b4c94953fb97fd27668, reversing
changes made to d97cfb50702eeda4ab7b8b44add4b173da739751.
Revert "Revert "Merge branch 'redesign'""

This reverts commit e8e300d12ba6985e35e5dacc3d7e3a583689c3b4.
Revert c92ec3c..5f632ad

This rolls back to commit c92ec3c344196e10c3243c23ad8eb6e5d9f92433.