Helps to stop using old eapi0 Thanks
*** Bug 653476 has been marked as a duplicate of this bug. ***
still fails the same way as r5, so please fix this first
We're going to lastrite it instead.