The bug in Zuul is fixed. This reverts commit d760940906. Change-Id: I81a8dbc541f486ac1a94e8e289057625c6fce323
d760940906