Revert "[FIXED JENKINS-18629]"

This reverts commit c01333c346176c93e8cbf93b5822978d8d2c0bff.
See
https://issues.jenkins-ci.org/browse/JENKINS-20262?focusedCommentId=188404&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-188404
for the discussion why this should be reverted.

Conflicts:

	core/pom.xml
[FIEXED JENKINS-20262]

Describing the previous fix.
Merge branch 'rc'