Revert "Branchless min/max"

This reverts commit 1365536fa3036d6c0b37f771ada4c589dda34f9c.