bug 844770 - reverting 7c49a7c651e3569c10969b6cdba053579a90916a because it depends on bug 841251 which is not on v1-train yet