Revert your commit 231e7c01f2415c1f25d6a2715b7469fe7fcfe771 on master since it broke build

[Min Chen]

Hi Nitin,
I have revert your commit 231e7c01f2415c1f25d6a2715b7469fe7fcfe771 on master, 
master build is broken due to that. Please re-do it.

Thanks
-min