Revert r362466
Such change should not have happen without prior discussion and review.
With hat: transitioning core