Revert "Implement new model for ostbuild"

This reverts commit bc8949373209a5f534c651a289069b687a9d5bc6.

Whoops. I totally did not mean to push this one to master.