[revert] dfe1506b52fd51702724efeac10f1feb1ee59cc9 and others