Any chance of backporting BugID #5042073 to Tiger?