Revert reduced IDs--not faster in tests.