Revert "Salsa can be slow, increase timeouts."

This reverts commit c5f44b3c2acfd631dafa3920e989042fc945fb60.