Revert "fixing issue #4992"

This reverts commit bf0eb6d5833e2eec1eee9dac9a879fb861bc488f.
Merge pull request #5065 from ticoann/fix_multi_core

Revert "fixing issue #4992"