Why isn't there need to do "Plug the custom..." handling here? (Not claiming there is, but seems like two places that did the same thing before are not doing it now).