correct imports in this forward-port to conform with checkstyle