[440495] Bug 441620 fixed in OCL25. Removing the temporal hack