Remove #if'ed out code for real.

Bah! I thought I had done this already but apparently git takes a
snapshot of the files when the 'git commit' command starts instead of
after the log message is written like svn does.