Revert now that we've got a fix for <bs>