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

This reverts commit ebfd4a07.

Acked-by: seth.forshee@canonical.com
Acked-by: stefan.bader@canonical.com
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>