revert some diffs with apache master