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