With the previous commit that introduces the klist enhancements, we can now re-do 2b7d6a8cb9 again.
2b7d6a8cb9