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

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