This reverts commit 28e33ea3. Reason for revert: Using deprecated libraries. Change-Id: I6b84f88c9b726e28dc0188ceb0585ec8a732d091