TEMP FIX: Adjustments to make 1.6 play nice - will want to revert this for 1.7
Bug on heroku related to this