Revert "Try to avoid problems with Session when bundling new plugins."

This reverts commit 2ced5043b11bc65c8ff1769d779658df6351ff24.