Bug 859372 - Fix for root.js refactor;r=past