cg - #2091 - looks good in staging, will turn off in prod for now too