try again

a full revert
Merge branch 'kitfuse's-fuck-ups' of https://github.com/thedarklorde/Dimensions into kitfuse's-fuck-ups