revert STM modification, it is efficient in testchamber now again.