Partly reverts changesets 161918045, 161917584, and 161917039

Fully reverts changesets 161918364 161918299 161918246 161918226 161918211 161918151 161918193 161918151 161918135 161918011 161917980 161917260 161917785 161917855 161918815 161918646 161918727 161918762 161918783 161918532 161918500 161918462 161918348 161918241 161918203 161918192 161918035 161917817