Ooops, accidentally removed '42foo' fix during the merge