Revert "Changes to EIERequest and EIEResponse."

This reverts commit b02f35657c2ee186ec04bc15d04547b07de153d6.