Oh, has this been broken for a while? Shouldn't we clean this up (by removing it completely?