I had to manually re-add the macs under "mac" nodes (hw-id was removed).
During commit I also lost SSH connection as it applied the mac on the interface I was connected through so I had to manually reboot the router. I suspect it changed the interface's MAC to the one I set, which isn't good at all - I'd add a second config node ("admin-mac" or similar) if the user wanted to change the interface's mac rather than just reassign an existing interface to a different name. See also T1499