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

This reverts commit 63f6655e,
which is superseded by later patches.
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>