Why is this commented out?  Do we need this anymore?