Undo core changes ff0109c5ae7db5113d2cf1d7d2ff3b59ac06a874

As there will be no "legacy" nor "transitioning".