Revert "Merge branch 'develop' into release/2.5.0"

This reverts commit 54b25a8124a3d459678d91aae836f73789d194e1, reversing
changes made to 59959b85bb99d1922bfbca229cfd927c9a3ca778.
Merge pull request #657 from caskdata/feature/revert-merging-develop-into-release-2.5.0

Revert "Merge branch 'develop' into release/2.5.0"