Move some code back to its place to minimize changes and return back tags/build info for saucelabs