This is just a band aid until an Aggregate `isLit()` method (for which work has begun) is implemented. (cherry picked from commit 98a6710c)