Revert changes to tx_generate_service