If uncommenting, then need to change the FIXME above that says "Not including policies, because lots of places regiser anonymous inner class policies"...