Revert "Gradle Build Script changes"

This reverts commit 61913765aab74ae3bc9ad4de56762579b7bf6eb0.