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

This reverts commit 8df3e327.

Revert in favor of stable upstream.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>