I hope this gets backported!