This reverts commit bf40183285. Use upstream stable commit. Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
bf40183285