Reworked Affordable Housing Legislation Passes Both Chambers