Backed out changeset dfbae87208dd (Bug 864327) for red
Backed out changeset d1ad5d5bc00f (Bug 1041085) for red