****ing mixins
****ing mixins

had to revert a nice change due to stupid test setup mixin magic BS


Former-commit-id: 6aad5189daccd53e3e4fff68f9a93d96173b2d13
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine