Revert changes done on nameindex by commit 4c2f333