Hand-apply 80562fe5dce5fd625da583ca6f7c2833f9db8754 from master (remove default scale...