Followup to Bug 904298