Revert "[US13.2] Avoid race condition"

This reverts commit 64a8649f51830cb41a53df26ac1b1361c7462c46.