This fixes a bug that was introduced in commit 239d1367. GitLab: #1025 Change-Id: I688bb22f39a96eae7dd4acb89225fd5962edfb07