drupal_find_theme_functions removes all theme "prefix_" occurences

While we can specify our own suggestions eg. for links, drupal_find_theme_functions strips out all "themename_" occurences. So when I try to make my own context suggestion such as (using bartik):

theme('links__bartik_main_navigation', array('links' => $links));

it won't find my defined function in template.php

bartik_links__bartik_main_navigation($vars)

but it will be looking for:
links__main_navigation

the reason is this line in theme.inc (985):

$new_hook = str_replace($prefix . '_', '', $match);

proposing to replace this with preg_replace (might affect performance, since it's being called many times while rebuilding theme registry)

$new_hook = preg_replace("/^" . $prefix . "_/", "", $match);

which will strip the prefix_ (eg. "bartik_") only from the beginning of defined functions

patch attached