Combined decision. NASA was unwilling to pay for testing propulsive landing, or allow testing on cargo missions, because the parachutes already work, and SpaceX didn't want to front the money themselves.