we're now regularly hitting the timeout on integration test shard 1 in master. should probably hold landing any other changes until @happy-kitchen-89482's changes land.