To avoid potential upgrade problems

Change-Id: If2c70c092aa5e71e02e7180a9dc7062640f3ac9a
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>