Revert "Halls of Lightning overhaul"

This reverts commit 6904525ed9fef207115d82b849a1cd9440e77946.