Bug 1083584: refactoring 1.