Comment 12 for bug 1434753

Same with vanilla 03-21 build.