stellaris_enet: intermediate merge fixup