This reverts commit 00b5f4af92.
This patch was merged before the timeout was merged to
tempest. This means that devstack is currently referencing
a non-existent config option. As such I think it needs to be reverted.
Change-Id: I947261dc330ef35efce1ecd805ba6e649e81a6aa