revert some ambiguous changes