Reverting this change; fixed nothing and exposed another issue
Merge pull request #165 from alxdarksage/develop

Reverting this change; fixed nothing and exposed another issue