This reverts commit eac0eaab. REVERTED BY ROYER YANGALI Change-Id: Ie00c369c4d5b10e7a17507d1b845cef3c64df6f4