Revert d23b078..c8a5239

This rolls back to commit d23b078d2bde6906bb5cbbd965d559ce8b340e45.