Merge "Revert "Make IEffect command more robust""