Back out bug 988653 (since it depends on bug 613659)
Merge backout