Backed out changeset 9024f38e3809 (bug 843666) for bustage.
Automatic merge