This is a change that made it to master.