- merge into an "old" version of 7.3 to avoid giant merge conflict
   caused by revno 3649(a null merge of 5.6.8), which now hopefully
   can be reverted in the correct way when merged on top of this
   commit.