Put commented-out code back in.  Seems to be working now.