☃️ Revert submitted: https://crrev.com/c/6957554