Back out 96d7eb930f0b because it got double-uplifted and hg wasn't smart enough to notice. r+a=me and DONTBUILD