refs #8614 temporary reverted changes

as they cause strange behaviour

Revert "refs #8614 Should fix the issue."

This reverts commit a41f3e45c2a0abbe6a1c9f93f9a26d6140265ad8.
refs #4614 here the changes brought back again