Comment 6 for bug 1427566

Waiting for UX design