Revert "Fixed packaging and scripting errors"

This reverts commit d50f14392a943cdbc3a785490a940152959d6de8.