ARMORY-125 - Improvements for armoryd

Fix a bizarre merge issue by reverting some long-gone changes.