The previous behaviour did not match the comments. Change-Id: Ifc7bb3e34a0d8aaa6a6c2dc534f3b9603b1a76ab