Revert 108456. i.e. bring back r108444.