Revert "Ok, let's try this all again."

This reverts commit 7a5f3f553dd86f283c5a78bce953b05b584facad.
Ok, let's try this all again.