Remove unused import
Merged bug25437
Merge in default