Reverting the change in 1.21.