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

This reverts commit 9e3d2790.

Favor upstream
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>