Revert modal `dismiss` listener to its initial version

closes #37126 (closed)

Supersedes #37128

Note: I am sorry guys for any possible inconvenience caused of this change