Fix the fix for PUP-3324