Revert 0354c40..80a801e

This rolls back to commit 0354c4022d77ee66da320f9b0df4b992a9876630.