Unset the atomic number, which caused many regressions

Change-Id: I9c07f82cea3faef35fc55302d2f3f5fb74f7eb55