Does NOT happen with 4.9-rc1 even though this commit is in it. Either my bisect result is just wrong or it only happens in combination with another commit not yet in 4.9-rc1.