DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers."

This reverts commit 9e29523b9537983b4c4b205ff868d0b3bca0383b.

Change-Id: Ic9a97d1a98165500dd444b97629349cf082ced94
2 files changed