and turn on for prod, working well on stage (bug 932065)