Revert "Revert "Revert "Gamma control"""

This reverts commit d74634bdd4e623dbc3a0560e75723d6df9a91478.