Revert commit b20a1f56b0c915b24f70b8be83fbf76ea7378123.