Left some commented out things that helped us get through the 1.8 release.