I suspect you may have picked up these commented out lines from the diff I sent you.  I'm not sure why these lines should be necessary here.  But either delete them or uncomment them.