DB/SAI: ... and remove the EAI.