Modify: scheme 1.1, remove gamma components
(cherry picked from commit e7dfdf0242e89ff055bfb408d2cb35ff9c3434d8)