Revert "Fixing compiling errors 5"

This reverts commit f9e4a320d1f95e8fa42fdbc783d0c43e4b42cd95.