Revert "Fixing locking that leads to hangs on startup"

This reverts commit d71ebe70ac2464d3106a97b20db3db5117765bac.
Making startup barrier using unmanaged id