(experimental, use -wNoMahaf command line argument if this causes breakage) see #280 This was SVN commit r7058.