Revert RT #131190 patches.