revert all changes. re #8844

with the only purpose to see if this cause a change to performance of the sans systemtests