[PATCH] Fix a race condition with kickstarts (#868834)