Revert b48fdff..60b524c

This rolls back to commit b48fdffe8ddd488133848be6569c18ba0ded9ff6.