Revert "Temporary fix for race condition in switch to master using slave tx id generator."

This reverts commit 357fd50d2cb090d5594749330b4ecf466cfea3f9.