Hmmm... seems I broke it, so reverting

This reverts commit c20be1f21b69c3eb61c1795fbe04ecab6cd2a0fc.