Re-applied fix for recursive custom node ports