Revert ca9f1ea..50cc84a

This rolls back to commit ca9f1eadb431614702757202cdff61f61b95f183.