Addresses bug 1061888 review