(PUP-2399) Fix my fix to the fix
Merge pull request #2769 from kurtwall/pup-2399-fix-fix

(PUP-2399) Fix my fix to the fix