Revert 85e1c77..df7df89

This rolls back to commit 85e1c77d69cab1e4433f47df04ac381cdf69a172.