Further work on Bug 1061592