Regression fix from jellibean. Ref If6e57fc6acdc8b0147ca6a4420e49134785f4254