This reverts commit 9c49adf9 so
the upstream stable version can be applied.

BugLink: http://bugs.launchpad.net/bugs/1694621Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>