Revert "v0.2.6_(1054)_houseclean [8]"

This reverts commit 3b27194f87322a168cb7d63ad343c38eefb95f98.