Revert "Merge branch 'master' of https://github.com/HerculesWS/Hercules"

This reverts commit c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2, reversing
changes made to 58544d7f610261a903b3e843a795efd7571b2d56.