Revert d4f2477..40d5557

This rolls back to commit d4f2477c3ecd3a9e493bf47db9b1f0488d10e70a.