Rollout r156635 since the old behavior was intentional.