Revert "remove USE_RETIRE_FENCE"

This reverts commit 8d60ab163fedb4bb31abaff66b62e84795290992.
remove cd2