LPS-44342 Re-add methods, using new approach, as they are used by our plugins

Should we push this to master? Plugins are not compiling