Revert "API fixes per recent handle register changes"

This reverts commit 7ac2471d0679474f1954ccb745fba70d7386ae1c.