speed up recovery wipes

Change-Id: Ia0dc0c6bbcc88394c137a53cd3211bd105821ec8