Closing as a duplicate because I had cause to update this as the result of a different issue. *** This bug has been marked as a duplicate of bug 884798 ***