Revert 5f85173..d07df93

This rolls back to commit 5f85173e85270931f0485ded2833763c5f981de2.