Remove Bug #12739 work arounds.
Merge pull request #802 from Safety0ff/rmwrkrnd12739

Remove Bug #12739 work arounds.