This reverts commit d178b25daa and moves the initialization to the system context, which really where it should have been from the beginning.
d178b25daa