mcs2: revert recalculated address to original address on reporting
switch commands