fix accidental merge of commit '9edcf01d'