Fix EZP-21928: Unused use statement should be avoided, take 2