Reverted last commit. First I need a successful mvn release for ES 1.3.6