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