Revert "Merge master and rebuild."

This reverts commit 883c7bc5bb517b86bdd35eee8bf9165647ec2082.

Going back to last commit in master where all tests passed because I
want to get to the Selenium tests!