Removed code that should have been in the KIS branch.
Added code that had been put in the Web10G branch by mistake.
Merge branch 'kis' into web10g