[upstream] Grammar fix