Revert "LPS-35763 S/F fix" I fixed the plugin instead