Use more usual maintenance initiali[sz]ation code

Change-Id: I888c7226c4847dc2538fa96e2d91763ac22acd70