32df866434
Also drop the now unneeded compatibility shims. Tested by: marius MFC after: 1 month
Also drop the now unneeded compatibility shims. Tested by: marius MFC after: 1 month