Revert landed: https://crrev.com/c/6612028