Merge "Revert accidental change in test."