Check Abort and cancel module if needed

Revert last commit and check for abort in the module itself.

See Issue #13915