Revert "Im not quite sure if this is right"

This reverts commit 9cc0f51279d6dcc902b9c7b9c3ff18de2beadb72.