This looks weird. We should either un-comment or remove