back out API changes, only do the immidiate bug fix for this PR