Undid horrific consequences of the wrapping code. Never again.