Reverting because of an important regression. See https://issues.apache.org/jira/browse/VELOCITY-983.