Revert "This build is currently broken; just pushing so Alex can see what I have done if he gets a chance to work on this before I can"

This reverts commit 67ad8546d55fad606955e6b2b389cbc2917a45e2.