This reverts commit 0c2821d6f2de692d105e50a399daa65169697cca. Due to other changes this is no longer needed and resolves some other issues with plugins. Signed-off-by: Brian Goff <cpuguy83@gmail.com> Upstream-commit: 37d7b7ddc332541f516d0c41d9ad30b28f2d3e22 Component: engine