Try to avoid problems with Session when bundling new plugins.