Don't break backward compatibility unnecessarily