Reverts 38464331ec86d22004de5f720b07ff2283d22db9.