DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers."
am: 9cebd7cfba  -s ours

* commit '9cebd7cfba272117522617661cf9d4985880921e':
  DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers."