And remove an index which was added only to facilitate populating NULL
values.