Revert and fix some of my latest merges