Bug 900801 - (Revise 1 for reviewing)