Revert "Fix N+1 for looping challenge"

This reverts commit 667968fbb400ee90c207e769333174a044c9cfa4.