Revert 3rd party plugin support added in 246782ec