Some changes apparently got lost in the reverts