5c9d7af removed a bunch of deprecated functions, but forgot to remove
two more names from __all__.
Yes, I know * imports are a bad idea, but we have an internal app that
uses them. I've removed the * imports, but figured I might as well fix
upstream.
