BugLink: http://bugs.launchpad.net/bugs/1580754

This reverts commit 28c8fd86.

Revert in favor of upstream stable.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>