This reverts commit 2df105a118.
Reason for revert: break build of ripcurrentpro
Change-Id: I0e9fa3a59f5b8cd14e9a9e450b6c1508aace73ba
This reverts commit 2df105a118.
Reason for revert: break build of ripcurrentpro
Change-Id: I0e9fa3a59f5b8cd14e9a9e450b6c1508aace73ba