Revert "change of gates again"

This reverts commit d272f3d8652af35eab22598121a7b119ee9ac45e.