Revert "Made a big mess"

This reverts commit 069bc4de7e220c83788a65e2ab0f8f925d1ce793.