Gummify

Change-Id: I272318b1b39a9ca014b9e7c1466cdb5828239c32