Fix Rx serialization bug in takeUntil again

Sorry that #1656 is not a correct fix.