Which version did you settle on?  We should remove the commented out one prior to merge.