Revert commit bedd505.