Missing piece in last cherry-pick