Support diffpy.Structure 1.2 in the master branch.

This partially reverts commit 160b6ec7c84cfbfbcc0f9983c0f77c0000f409f2.