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

This reverts commit 95317559 in
order to apply the corresponding upstream patches.
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>