LPS-35335 Properly deprecate, or else plugins can't compile