I agree that this is an ugly hack and that it would be better if it was fixed on the l10n lib... but fixing it downstream is a little bit harder - we need to get into an agreement of what should be the expected behavior for each case (eg. 1h59, 1h32, 1h18, 1h04...)