revert code from #93 MR which was removed by someone.

revert code from #93 MR which was removed by someone. #132