revert due to compilation problem

This reverts commit a79d9a561fd279fd1eb174a4a342d560caaec44e.
revert due to compilation problem

This reverts commit f550ed045110e1bf1d92d3934d4e953e51b36a15.