Revert "#6012 avoid a surprise by keep notice of a change"

This reverts commit ab175adec95df721dc901bc3811017a0ea4dc38d.