Bug #3811 - Rearrange one import