Merge "Revert "Check transport before registering.""