This change (especially conditional block below) could use a comment