Why is this removed?  Note I just merged some other changes to this section.  I'm curious why you changed any of it.  Maybe the new code addresses this now?