See if this code could potentially be backported to 5.1
Bug watches keep track of this bug in other bug trackers.