Revert ea19a00..af0d135

This rolls back to commit ea19a00c8ea33e72213b860da76007ed7438a986.