Revert 6c361e5..4fb102a

This rolls back to commit 6c361e56d84b8e84a2c19a6957bc621a3cd656a8.