this change comes as a little surprise given the commit title ;-)