SF patch #701494:  more apply removals
23 files changed