This fixes the API breaks introduced in the recent patches, it should now function as originally intended