fixes #767 Remove old _id hack logic, replacing it with pk hack logic.