Merge "Revert "try to stop using exotic clipps""