Possibly related to the whitespace changes, these types of changes should ideally be reverted as well.