Reverting fix which breaks remote build in rare cases.