Replace wrapping with meck with a custom solution.

Replace wrapping with meck with a custom solution. #2