Revert wrapper behavior to match API