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

This reverts commit 76811e1e9083bdd8c5b8c85be42ba4c5ee4be320.