0762c948b6
This reverts commit 932c83fe8f.
Reason for revert: need to update other projects (linuxpro & marnier)
Change-Id: Ib02194d052170e487cd56480eb0d9226895aa580