Don't cause 2.6 to fail if we don't have to