This reverts commit 7aa24116.
It breaks the code model updates completely. So reverting this change
until we have the right thing.

Reviewed-by: Roberto Raggi