This was fixed a while back for 3.3, but I forgot to remove the TODO item.