This reverts commit 22140f9f.

Not suitable for 4.2-stable (no SWAPPER_BLOCK_SIZE definition).
Signed-off-by: Kamal Mostafa <kamal@canonical.com>