Also we should add unit tests to make sure the admin_api isn't invoked for non admin users in this code path.
Also we should add unit tests to make sure the admin_api isn't invoked for non admin users in this code path.