Since this is commented out, is it ever needed? If not, let's just delete it.