rolled back incorrectly merged in changes from 6.3-RELEASE-JNPR