Revert b521bb0..e62ae0a

This rolls back to commit b521bb0a256ceaf7c677fa9fd790de14ea0732ee.