Unreviewed, tiny partial rollout of r228260 as it caused some worker failures