Returned impls back to eap61 war, as caused injection issues when trying mock impl