This is an example of something that can be moved back. We moved this originally because these modules were getting initialized before it was ready. This shouldn't be the case anymore.