Backed out changeset a9cf5734aff2
Backout 6bdab42ab879 for breaking S builds