Backed out dwim code, broke on org-src.