[Misc] Fix regression introduced on 4/4/2013 (ie for 5.0RC1 since 5.0M2 was released on 3/4/2013) in revision 16074ff in a commit without a JIRA issue