LPS-48577 0a92eec3c41536e3eda5854ca1aa9b0f59b766bb undo the fix in LPS-48687 cf359d879e9f7bb5abbbaa456af6949bc76fa707
LPS-48577 Fix generic warning
LPS-48577 Useless super() call
LPS-48577 Leftover garbage from 0a92eec3c41536e3eda5854ca1aa9b0f59b766bb