backout 5efda3c30be3 (the second cset for bug 873378) after dzbarsky backed out the first cset. (to fix Android R2 orange)