I agree, it would be nice to be able to disable that behavior. Per entity might be nice for backward compatibility.