Revert min/max due to speed impact (reverted from commit 817d0188d8850755d70f32d30ef4bccebf984da2)