Add back the temp fix to pkgng 1.3.0rc4, patch still fails to work