BZ-9741 Adding missing require, Removed special handling for archie