Revert "LPS-48926 Sort"
Revert "LPS-48926 We can simply change the import since the class in compat extends the one in portal"