Revert id storage back to before troubleshooting