Missed a couple of changes while cherrypicking.