Revert accidentally pushed design changed.

This reverts part of the commit
2893c73a945d545733c63469933b2530d103ad73.