Backout 66c886b7d927 (bug 827715),2c7287304555 (bug 829679) for bustage