Removed unnecessary divergence from Apache source