Revert various recent troublesome commits