Remove dependency on apache-commons.