@jbau this is my bad. I thought I was seeing a race, and made a mock file that verified the race, so I added in this condition. However, I never made a unit test and now I'm seeing that there is a small typo in my mock file, and you are correct.

@brianhw I think you can get rid of this special case - I am mistaken here.