Revert "Relax time constraints"