I think #SovEng is a step in the right direction, for instance, because it's helping people help themselves.
They could also maybe make sure that every product they assist with has a private funding model in place before the grants run out, so that developers don't stay stuck on grant money, and users don't have an expectation that grants will pay for everything forever. Maybe slowly phase-out grants.
Even people who get grant money would rather run a sustainable business. That should be the goal.