Revert GT-ERR-01

Reverted the fix, which is not working at all and is breaking even more
stuff