rollback race6
Revert "rollback race6"

This reverts commit 51310ba166da3d292857142d83cd471d4ea52b55.