Revert "attempt to solve wrapping problem"

This reverts commit 823a71a109a6be370d7fe894dd6424e0fa164b0b.