This is actually needed for KItinerary Workbench, which I missed when checking this. This reverts commit aefdc446.