This change was included in an unrelated change b57d6138 and was of course not intended for commit...