(cherry picked from commit 9a78273665)
9a78273665
Fails pretty regularly on Shippable/AWS, never locally- always seems to be on the last async task in the loop.