An absolute horrifying commit of changes. Most of this will be undone
soon again.