Revert fix for someday due to API change