[ref_impl_eiffel] [523] Reverting the temporary hack committed a few minutes ago to try to fix CruiseControl, which has now hopefully removed the conflicted files so that we should now get a successful build with this commit.

Revision: 523
Author: peter.gummer

Log Message: