Bug 889940 part 1