back out API changes from mainenance branch
12 files changed