True.  I figured that will all be replaced soon anyway, so I just hacked it in for now.  On another branch it is already gone.