There was bug introduced with a refactoring in commit: c9546a36 The code was refactored again in this commit: 60ac58ef Change-Id: I6c96dc1b9e0632865ae6742ed596624f7ed3d623