revert fixes
revert fix chameleon engine
revert chameleon engine