Really fix #17982 this time.