This should be dropped instead of being commented out, considering it's dead code.