Revert "Merge branch 'jmd-update-error-message-concurrency-queue' into 'master'"
This reverts merge request !5058 (merged)
Changes made in !5236 (merged) supersede the logic that was in place when !5058 (merged) was first opened.
Let's revert that change, and use the original logic error messages.
Edited by John McDonnell