Revert "Merge branch 'design'"

This reverts commit 812dcb27f3f8d607a1270206f18176a048326902, reversing
changes made to 048b166caada176159c7e49bb6dfa56a8e08af98.