Follow up with the problem noted in r90530.