Revert "Ruining design"

This reverts commit 61b626ef77076b736ab16e545e3d31a73796d31d.