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

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