Make Soledad wait for EIP before starting (#4885).