Bug 1070722 - Backout accidental inclusions in a4ae53da4fe6