Revert 8bfe7f5..35b8eda

This rolls back to commit 8bfe7f59f1352363700d80f758ae12a5ec0ce590.