remove duplicate code plus small optimisation
Merge branch 'master' of github.com:eclipse/vert.x
Reverting recent change for now
Merge branch 'master' of github.com:eclipse/vert.x