Revert "Ok, how about this?"

This reverts commit 20e1ec52e466a85881ab31bf2f6b45f0a5db5ddc.
Revert "Try to get the tests working"

This reverts commit 6d58277096830e32ee93dd9c48da084d8ef2e673.
Revert "Revert "Try to get the tests working""

This reverts commit 7a90de1e3bad63d8591f02c3eeff4df3cf09cd1d.
Revert "Revert "Ok, how about this?""

This reverts commit ea3d21093e5cc4258710d8569085246b65e44a96.
Revert "Ok, how about this?"

This reverts commit 20e1ec52e466a85881ab31bf2f6b45f0a5db5ddc.
Revert "Try to get the tests working"

This reverts commit 6d58277096830e32ee93dd9c48da084d8ef2e673.