Backout bug 1053252, no need for different package name (r=backout)