Backed out changeset 0eab3abfb5dc (bug 1088247) because the bug it depends on isn't approved yet.