Backout Bug 863398 for causing Bug 887519