Bug 5032 Remove duplicate code