Revert "Yet more efficient"

This reverts commit cbf0400db86dddfb4ff4537c77b31ed99d33e4bd.