Revert last two commits

Didn't work. Will leave it at that and investigate later