Backout 3985cb4da6b6, 55ab9f026dc4, f7ead00b7654 and e2108ea96ae5 for a variety of build failures on a CLOSED TREE