revert landed https://crrev.com/c/8235832