Return to a sensible API prior to v1