Revert "Should fix compile error for new common update"

This reverts commit 88cff6b781f0b01011f3be12de713fa359e3cabf.