Reverted code generation specific pieces.