Revert  r86517
3 files changed