Revert "bug 936068 - fix packing with -o to work in Fx26"

This reverts commit 1aab173987fdd4adefebe3cbf70aee34f53a6c57.