Revert "Fixes"

This reverts commit e393fbbffdcd61ed85a6b0d3956f075b7ee31904.
Finally fix derp