Revert "Some cm differences and only observe if gestures enabled"

This reverts commit 1493724540e6468a244c24a794232fcb04544b4a.