Cherry picking 0.2.2 fix.