This seems to be the more reasonable fix for 2a20348c