Bug 1085669 and 1085685