ef01e6e86b
This reverts commit 3b7209d0d6.
Reason for revert: replacing after the lib drop
Change-Id: Ide0a88da611d4a9dfe0c7ba980fabdc14ac96b31