Revert (most of) 41e6f79ffde9; it was causing lots of conflicts moving stuff from stable to default, and the node names mixed together quite a bit (in my head at least). Instead just append "1" to the node names to discourage conflicts.