Applied Cybermuz solution to build issue on 3.10.x
Revert "Applied Cybermuz solution to build issue on 3.10.x"

This reverts commit 7e63a1ea8aae2c429ef6659c86498c3e3cd8ead1.

Although it will work, its not necessary to do after the xuzhen merge.