Please consider the following patches that reverts a sauce patch and integrates the upstream fix for the Cavium zram driver. These patches were tested by me on a Cavium ThunderX system on Bionic. Please see bug https://launchpad.net/bugs/1787469 for test results.