Merge pull request #1799 from DaNiwa/prep_release

Revert "Add in hacks for CommuniCon"