Revert "Its messy, its horrible but t0lte cannot die!!!"

This reverts commit 3ad9517a5077db235753af37ba929ba3c4499da1.