Gummify

Change-Id: Ia892aa4de55c91d04cb62bdc449deaad9ecac021