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

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