Backed out changeset 105e1f064e67 (bug 895359)
Backed out changeset c089c7694bb4 (bug 894876)