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

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


Former-commit-id: 617dcaca417212540d0246bdb654cae6a10a96ae [formerly 617dcaca417212540d0246bdb654cae6a10a96ae [formerly 6aad5189daccd53e3e4fff68f9a93d96173b2d13]]
Former-commit-id: a425c4b58fa2891f3d7c72f8fecec9e4d487dbd4
Former-commit-id: 2e486d834cc76ff1390ff3d08d9011224dbf97ff
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine