Revert changes which broke backwad compatibility

Based on discussion on jenkinsci-dev list https://groups.google.com/forum/#!topic/jenkinsci-dev/zQHg8LoOAH4