Revert "Ivan commit"

This reverts commit c94291da568206699db23e748ff480200f13a13c.