Reverted metamodel change from #167 - fixes #486