Merge pull request #6 from apache/revert-5-develop