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

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