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

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