Backed out changeset 05ddfd9f4f09 (bug 815002) for hitting bug 1017634 again.
Merge mozilla-central to fx-team