Backout bug 1061163 - pushed to wrong branch (r=backout)