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

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