Revert "comment some overylay to pass build"

This reverts commit 815e6f3355a1c512e6af0ea5e9f8bc63800cfa82.