REALLY fix gesture creation!

Change-Id: I2a9e8c2a33fb38fb4efce2c5611d1acca5c7e50a