reverting some things hopefully.
Merged first.