Attempted to hard-reset
This will need a LOT of work to get it back to where it was (re-compiling etc.)
I also attempted to minimize the diffs and add back what was added in the commits after the reset point.
Prepare for 2.4.0!