Brining back the passed wrapper.

#25