Revert "Merge "Enable gamma feature in DSS" into jellybean"

This reverts commit 43b491208430a47b24709a94da4f45c4ef5442af, reversing
changes made to 729316019eeba08af143ee06f04d5f7d8a3b0ee5.