Backout bug 1052343 because 7b7c24a989fa hasn't been reviewed yet