Bug 845095 - backed out 8cb9d6981978 as per r=surkov