Freedom of Religion Bill returns after 20 years