Revert "Updates to the new EI maps"

This reverts commit 0efe12da4fe596324c1be9008d39f66b96cc9aa1.