Bug 908673 - Removed popd from control script

* popd in some cases attempted to cd into directory user didn't have permissions for