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

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