Half revert c46b8a2b45afa7491ba164775a725fcdad062ec0