Hmm, I feel like this is something we should "keep clean". Add a ticket for this, and whether createIndex does it right too?