Revert 93c492b..022c9b6

This rolls back to commit 93c492b2491817045fcc44845fe765c7517c8b67.