This block of code seems to be what perturbs GF at deployment time.  At this point I don't know why it causes a deployment problem, but for me, if it's commented out I can deploy.

I also don't understand what the side-effect of NOT having this code is.  So please treat this commit as a "conversation starter".