Revert "Fix barrier"

This reverts commit 7064da9e4fa6f0c247b9e26b912d75c43c2f6252.