This is causing the regression in the admin UI