revert 731 because of suspicious mem issues in ci-builds

revert 731 because of suspicious mem issues in ci-builds #3254