Revert to wrapper