bug 857089 - backout changeset b85353b6cc38 pending revised UI for the feature