Backout 66f4df0b1cb8 because the commit message got mangled; r=me