Remove wrap() calls.
2.1.1