All code around this does this too, hence do it here as well. Also fix plural verb form. Follow-up for: #32018