Undid one cleanup change to fix Jsp error