Revert d3222a9..ec40934

This rolls back to commit d3222a93a0a5df5fbf9704eda1fe907177aa2a82.