Revert changes for now due to failing test
Merge branch 'master' of github.com:materialsproject/pymatgen