Revert "Some fixes to FixedBarrier."

This reverts commit c00ed0a3bc2a98e70aedf0910ab3bda630b685fb.