Revert 22c276c254ff97d20a51929846ad830bfbc6465a