FYI, this is the only real change. The other changes were to repro the problem in an integration test.