Undid EA-913 changes