Fix merge 5f87fce90b2af7421ae3e9088e17d2aef9c7a061.