fix up merge d9c7147 (git duped a couple of methods that had moved)