Bug 1063271 - Undo bug 796938 part 10. r=smaug