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

This reverts commit 25375803a219565a626cc4dd5c595208251a9676.