Fixed an issue left in with two cherry-picks.