Another unrelated change that was necessary to pass the tests after rebasing.