Revert 3bbe54bb719cf40b477161fd6486916c1da1828e