Revert "Fix following build issue"

This reverts commit a0c20b161480786e3ed32511d75a6889815f56aa.