See summary. Please consider addressing bug 630752 while at it.
Bumped in commit de3631ecee4f2590d3ba4138d4a97ed8cd64d7a4 but bug was missed.