Revert c9145dc..8d70ffc

This rolls back to commit c9145dce9bf8a5418c959099b73b92faffaf9f55.