My earlier "fix" for PBQP (see r165201) was incorrect. The real issue was that