"Moving" bundle_without to master.

This will cause conflicts later. Sorry.