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

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