Revert 0432e63..f96b15b

This rolls back to commit 0432e63c9b10e092b94f7b477d566cccfb628153.