Regression caused by commit b56c2c998

Fixes bug 1109001

Change-Id: I5f0304cca380813e552cd229635a9aacee42126a