Fix issue with bundle creation changing the working directory and not
reverting so commands were being executed with an incorrect working
directory.