Revert a8ee256..581b85a

This rolls back to commit a8ee256b15d3dde9e1f1f0a6ef95f9e545a1ae78.
Changed some other stuff locally

Locally changed some stuff