Revert "Not sure what is going on..."

This reverts commit ee3022b618998da858c366825d6ef48b4c0985f7.
Messed up.