Revert "activity_confirm"

This reverts commit 1ae1b0800f5fbb0c65f1d0b0e9b40bc548ff9958.
Revert "Revert "activity_confirm""

This reverts commit a540abcf91f924e203f7cfb7bf7db64e75cb5065.