Changes for bug 63895. Earlier changes reverted and only initial request committed.