[797] Completely custom timeout approach as suggested by dsaff in #727