Revert "Regression fix #343"
Merge pull request #586 from DHrpcs3/revert-582-patch-7

Revert "Regression fix #343"