Patch Set 3: Abandoned

This has been fixed with Change-Id: I441db34f226be36548c61cef77958995971498de. The latest Patch Set proves it. The patch contains only an updated test which would fail otherwise.