Ensure clipping gets disabled properly when previously enabled