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

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