Revert "Revert "Settled race condition TODOs across all platforms... as an unfortunate case :(""

Put this back on master so we can debug.

This reverts commit 67adbd43a1bbf35fdc3963b34ae5631758006fee.