Put back both versions of the API, so we can start merging into something that's cleaner...