Revert "Merge branch 'master' into phyxml"

This reverts commit 225d797eb25ab0d0dd65e9a7e4c5f879e5923d0b, reversing
changes made to 55e1eb470629fe19a0cdbbecf53d75fa757fa7b7.