Revert c91fea6..e6e00e2

This rolls back to commit c91fea631ca48ad0c088185fc47a4769db23ee4d.