Revert 735bde1..173b9bb

This rolls back to commit 735bde10c1b2c5d6397dbae7afe049394f430a34.
...