Revert "Fixing compiling errors 6"

This reverts commit e93b75815186fa2175cf86234599fa2bb6cf3080.