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

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