Work around removed API