Reverts 729b82, d5f65f and 724add