Bundler workarounds, refs #218 and #bundler/bundler/3286