This reverts commit eec2d301.

This commit broke tests. You cannot have a file called "bundler" on the load path.