Revert "Design fix"

This reverts commit e5a0db53778bc851142ad6b4037b20bc6a757ed7.