Undo name change for the controller list (cherry picked from commit f60622c5103e37f221aa8252acfa9073cfbafbc7)
2023-05-19T14:26:37