BugLink: https://bugs.launchpad.net/bugs/1837235

This reverts commit a713ff5b as
it seems to be part of a set causing regressions on 32bit.
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>