Revert "use default OID if missing in model"

discussed with Guillaum on IRC. This changes is to invasif for a
stable release.

This reverts commit dd327fcbc95ebc58a78d56760c7b1d3e016283f3.