[bart: manually ported it over via82cxxx changes]

From: Andrew Smith <asmith@tranquility.fsbusiness.co.uk>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>