This reverts commit 765191e7b4. because the updated packages cause a gradle build problem.
765191e7b4