Bug 848023 - Backout 123989 for mistaken push on r-