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

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