Remove redundent import.
First attempt at fixes for 7.6.