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

This reverts commit c7082994.

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