Revert changes made over the weekend to fix Webbrick problems
Commits reverted: 668fdf7ec257b24f140be5c46359c7b00d38ff14, 26f2dc30fb9394858e3d6dafdcfcf740e40bfbad, 83cb76a9972c9ef70679a42b7c9df483898b66d2, 9c3c94d024cbb76a0336950fa2faf2626a823679, 4865afed80718f9cae3bea9cef1c8987a7498d2c, d345b01a030a006b4f03c3bccadbef2dde9d2ed1, 2add66b748f86e3c883381ca310225ff01bceb42