Backout fa32e1a60c0e and dd945976cc0c due to files that slipped into the merge. DONTBUILD