Revert "Revert "Set timeout to 15 seconds.""

This reverts commit c8b4e8d702eead9abaa538bdd7ce21befd3a8af2.