Commit for BugzID: 496.