Temporarily revert commit a3fbc23.