Some folks complained about this, and the original change was not fully
approved of by everyone. Hopefully this compromise generates less
friction.