PACman cherry pick: fix ALL the derps