Got it back to a (somewhat) workable state again.