Second attempt to fix buildout vs service race conditions.