A common time unit for every temporary solution is "one forever". I believe we can just remove the code added because of bug #154990. Thanks Andreas for your archaeological research.