MT#6485 Remove 'set -e' which fails inactive->active switch