Restore old logic and add a @ at unset to silent when it is not set as suggested by Ermal