Bug 889940 part 2