FIX: Typo in merge of upstream commit de6c4f45a