Backout 308e3cd73c5f, cc9980cb3db2, f5591bedc40e due to build failure