Revert "Super mess."

This reverts commit b879f1a331caefd7f8007c0baee198fb97a4fa4a.