Removed accidental commits.
Added the old interface functions defined in terms of the new interface.