ref_impl_eiffel [312] Partially revert revision 296.

Revision: 312
Author: peter.gummer

Log Message: