Revert c58be16..053a5b0

This rolls back to commit c58be16597b5555048f852a61b707de087fb802f.