regression from

commit 8998768a
Date:   Sat Feb 6 18:38:32 2016 +0100

Change-Id: I217fb66621505b77b6102954c07ef513e2d4b25e