Bug 898074 - Backout c92dc0497dfb, a=test-only