I'm an idiot who removed too much. Shame on me. Also some clean-up.