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

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