Remove unneeded and incorrect defun

Oops, I committed broken code. This should work quite a bit better. At
least it eval's properly.