Backout

backout bug 908601 & bug 911668 in 1.2