Removing hack in light of recent environment changes