Bug 1080275 - Move setup logic into helper.js