#11614 attempted to address this but did not handle 2CC properly, and changes to the default livery were not handled.