Backout 7971f738a6cd temporarily as a safety precaution. r=jimm, rsrong, me. a=me