Revert changes to allow empty invoke