Restore 32bit compatibility