Revert "Fixing compiling errors 4"

This reverts commit 608c000e9f204e0df478942e832c4bda19518c9d.