Revert "fixing compile errors that are nondeterministic"

This reverts commit 128f1f0847c30efffbe719f842a9a4ab10076e18.