Bug 1060254 - Backed out skip changeset feb1f359b418