Back out Bug 678392
Merge backout of Bug 678392