Delete photo link from a profile on a drupal user page takes browser to invalid link

When a profile is configured to be used from the drupal user tab and includes the contact image field an image can be uploaded successfully but if a person clicks on the 'delete' action then once the image is deleted they are redirected to an invalid url - the string in $toUrl below is simply 'delete' and they wind up on the CiviCRM home page - which for front end users equates to an access denied link.

$toUrl = $session->popUserContext();
CRM_Utils_System::redirect($toUrl);

When the profile is accessed through a link like

http://civi45/civicrm/profile/edit?reset=1&gid=14&cid=203
they are successfully redirected to
http://civi45/civicrm/profile/view?reset=1&id=205&gid=14

So the issue is that the right path is not being stored to user context from the drupal user edit path to the profile.