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 am: 6af4ec5750  -s ours
am: 81512b2aa3  -s ours

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