Revert the 1.27 change (mixed changesets).