Revert b6b2259..9285b8c

This rolls back to commit b6b22599f9baf2f9808545715f7ffcc1d9f22636.