revert not-fully backwards compatible change to ensure future compatibility with V6/7/8 photon energy regression