Remove local imports due to Issue 7016.