Remove this check in favor of making the call earlier