CFY-1511 revert ImportError