Undo 'rebundle' commit (00b921e24fd38c4241efe2d270c64527d1bb204f)

That commit message indicates it was just to update the committed
Gemfile.lock. There were other changes, all of which seemed like
reverts of recent fixes. This reverses those reverts.