Fix breakage by automatic import cleanup