Merge "Revert accidental change introduced in 000e188570."