Suspect culprit reverted https://crrev.com/c/8520999