Temporarily pushing back createIndexes change until that change hits the nightly in the server.