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

This reverts commit 86b9c76b0c7c5bbdb6196effb2c7ae4f08e11b80.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>