Michael Meeks pointed out that the latter can cause problems.

Change-Id: I68e7f8c6dcfae52305738b2a8cdee72e9c2c7f93