Revert "428691 Makes timeout for deployment configurable"

This reverts commit 136c13f62d81a29e58a2095eca39fcd6dc2694e3.
7 files changed