Revert "Add in hacks for CommuniCon"

This reverts commit 071a5a8fb1a877e751db484ce869ea177b514948.