Originally from
bug 460706