Signed-off-by: Matt Moyer <moyerm@vmware.com>
Eventually we could refactor to remove support for the old APIs, but they are so similar that a single implementation seems to handle both easily. Signed-off-by: Matt Moyer <moyerm@vmware.com>