Revert log4j changes.  Will revisit later.