Revert "Fix gather"

This reverts commit 7772012dd91065e9be20ead3c597d0fb471ec4c5.