Revert d5726d5..05fd1a2

This rolls back to commit d5726d55ba50debb0c1ee440d6ece4da8443ac0a.