Backout log4j changes