Recent changes by Aaron seemed to work, but that is because the cache avoided actually running any of that code. This is the fix.