revert landed at crrev.com/c/6421745