Reverting client to mainline