Revert "HORNETQ-1117 - prevention of races during XA protocol"

This reverts commit 087e2b5407e41959b24c1434455f721496bd23b8.