Revert unbreakable API, doesn't work as intended