This removes the early return that we have on these classes to prevent
eager loading in production.

This also prepares us for the switch to Zeitwerk because it complains
that the file does not define a class in production.