Bug 908825

Create gear uuid index in the right place