Revert 7b73b54..817896b

This rolls back to commit 7b73b543cfef6f3e11e516eaa40896a3b709e4d3.
blah