Backing out 893fa8436b70 (bug 1041917) for multiple problems.