Reverted revision 1.83, which introduced a bug and subtle incompatibility

issues.  See bug #1112856.