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

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