Revert "Merge pull request #4309 from LBraindead/dev"

This reverts commit 3b26dab9544987a6b4f8fcaf9230f7d29e5728ef, reversing
changes made to 8430e0a720771db4fc630f2f4170d923a052deeb.