Remove ugly code duplication in ReindexForkController

Requires I2071f04b from core

Change-Id: Icf084e87dcf8cfc6bb5e314d53a02e7a08e8237e