Partially reverts ff0f1523c1436f4b2f0b334a53e0fbaba1b9ae84