[PBQP] Re-commit r220642 with a workaround for quirky Visual Studio behavior.