Did you comment out this block?  Do we still need this?