California state senator amends controversial housing bill