Bill to do away with marriage licenses will be back