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

This reverts commit 6ac65b6e.

Revert in favor of upstream stable.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>