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

(cherry picked from commit 00ad2837d144c77e3748537672573e75cdf58b67)