Revert "Fix Compile Error"

This reverts commit 2b22076827b75bc92d32b0c0dd1e170f62e4a81c.
Adjust Files per comments