Changes to machines and nei plugin for macerator.
Revert "Changes to machines and nei plugin for macerator."

This reverts commit 9ab35a03c0e9bb0d4d1a96e95dc0cedb3c9b9f53.