Revert submitted: crrev.com/c/7829443