Revert commit 65c601e3aa895b0dd357513ef02314b86fc66173 for now.