Revert 1c7cb4881ef7dd1db10792bb649122d8c3b050a8