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

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