Revert non-autoincrement key fields change, since I cannot recreate the bug