Warning message about using Facebook picture appearing too many places

I am currently using my Facebook picture, but I have multiple profile categories (to be specific, put there by CiviCRM).

The warning message about my user picture is appearing on every profile edit form, not just the one that actually has the picture information.

I suggest changing line 183 from:
if ($form_id == 'user_profile_form' && variable_get('user_pictures', 0)) {
to
if ($form_id == 'user_profile_form' && variable_get('user_pictures', 0) && $form['picture']) {