revert some option changes to debug problem