Revert commit 212599.