Revert 692dd05..22b44e9

This rolls back to commit 692dd0526e0a355c6c03935c3a0c1b7b8445457a.