Fixup for d38d168 - will squash