Fix broken long op + discrete timeouts. Long ops shouldn't have the default timeout applied