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

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