Reverted 1.07 changes

Broken <.<