Can you extract this to another PR? Changing it blindly like this is dangerous