Redid too specific fix for #3391.