Resubmitting the original fix for bug 511845, but with an additional fix
and regression test for the regression it introduced.

Change-Id: I98a6660f81bcad95aec1cd1a4ca9159d5d89da41
Signed-off-by: Stefan Xenos <sxenos@gmail.com>