Revert "Merge branch 'design'"

This reverts commit 40bef3f9be5bf335354b3e7bb1b96b6e3e15697f, reversing
changes made to 6e955604567ad056f6298f8737c33c8f512a5408.