Revert c77ec24..2e5d4af

This rolls back to commit c77ec245e8298f90a87abf16826421132c8e382e.