Revert back to EF5