Revert e44b20d..571eddc

This rolls back to commit e44b20dd62a628fb292f6a2ea458356519ea9d92.