Revert ISPN-2025 when AS7-3180 is done.
AS7-3180 Clean shutdown often results in "Problems unmarshalling remote command from byte buffer"
ISPN-2025 NPE in Externalizer on shutdown