Issue #3321297 by nmillin, mark_fullmer: Use the ModuleHandlerInterface instead of the ModuleHandler concrete implementation