Undoes changes to emitter.dm & field_generator.dm in my other commits, then applies bugfix.