Revert "get rid of double wrapper"

This reverts commit d5a7f44df63607740435070f4f5021b7176ee1e5.
what am I doing