partially reverted e70992d