Revert CL: crrev.com/c/6111694 was landed