mark in TODO that I still need to document that API change...