Rolling some of the previous changes