Revert unintended core changes in r52627