Re-add some old crufty code (for now).