Revert "Fixing compiling errors 2"

This reverts commit 5a86a611603d1ba85143c0baa61fe44a2553bb2f.