commenting out config that breaks the site
Merge branch 'master' into campus-3154