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

This reverts commit 81739df8.

Misapplied duplicate.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>