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

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