Backout bug 807563 (rev 92cdd367285d) for causing bug 815666
Backout bug 806256 (rev 08d397c13da6) for causing bug 815666