Merge pull request #685 from neilcsmith-net/revert-gradle-upgrade

Revert Gradle upgrade