Revert "Remove anti-https bundler workarounds"

This reverts commit ab82f3e6fb8cefe7a0f5d82b664def3df985a923.

Conflicts:
	test/acceptance/app_test.rb

It seems the issue is not fully fixed