Reverted the comment/issue fix stuff that I broke