Revert change in ResourcePatternScanningOptionHandlers from PR #1014