This cset is to roll out the cset applied earlier from Ingo.
This bug has been fixed with a different cset.