Revert "Merge pull request #2410 from gmaxwell/salvageharder"

This reverts commit e5ddaf5ec8ae703818dcdcf28c7dd6e001b6d681, reversing
changes made to 7aaaff37ffb3ad71b6a5423060965ce0c2012884.