Bug 899923 - Backed out skip changeset 667ce2a60961 due to fix