backout 86027af6a98f: bug Bug 979440
merge backout 02c74aa31b51 commit -> default