This is the only location in the codebase where it's being used, so no need to make the main lib have a dependency on it. (cherry picked from commit c591cb8fda)
c591cb8fda
Move the remaining plugin components within the plugin source code. (cherry picked from commit 99173c5fc4)
99173c5fc4